Fix for no command screen